Skip to content

Conversation

@Zhenhang1213
Copy link
Contributor

sorry, this was my mistake

@Zhenhang1213 Zhenhang1213 merged commit 700aa5e into llvm:main Nov 15, 2025
8 of 12 checks passed
@llvmbot
Copy link
Member

llvmbot commented Nov 15, 2025

@llvm/pr-subscribers-backend-arm

Author: Austin (Zhenhang1213)

Changes

sorry, this was my mistake


Full diff: https://github.com/llvm/llvm-project/pull/168230.diff

2 Files Affected:

  • (modified) llvm/lib/CodeGen/GlobalMerge.cpp (+1-7)
  • (removed) llvm/test/CodeGen/ARM/force-global-merge.ll (-23)
diff --git a/llvm/lib/CodeGen/GlobalMerge.cpp b/llvm/lib/CodeGen/GlobalMerge.cpp
index ef7b1c758ff71..e58d7e344c28b 100644
--- a/llvm/lib/CodeGen/GlobalMerge.cpp
+++ b/llvm/lib/CodeGen/GlobalMerge.cpp
@@ -111,11 +111,6 @@ EnableGlobalMerge("enable-global-merge", cl::Hidden,
                   cl::desc("Enable the global merge pass"),
                   cl::init(true));
 
-static cl::opt<bool>
-ForceEnableGlobalMerge("force-enable-global-merge", cl::Hidden,
-                  cl::desc("Force enable the global merge, regardless of the optimization level"),
-                  cl::init(false));
-
 static cl::opt<unsigned>
 GlobalMergeMaxOffset("global-merge-max-offset", cl::Hidden,
                      cl::desc("Set maximum offset for global merge pass"),
@@ -379,8 +374,7 @@ bool GlobalMergeImpl::doMerge(SmallVectorImpl<GlobalVariable *> &Globals,
         Function *ParentFn = I->getParent()->getParent();
 
         // If we're only optimizing for size, ignore non-minsize functions.
-        // And add a config to force global merge
-        if (!ForceEnableGlobalMerge && (Opt.SizeOnly && !ParentFn->hasMinSize()))
+        if (Opt.SizeOnly && !ParentFn->hasMinSize())
           continue;
 
         size_t UGSIdx = GlobalUsesByFunction[ParentFn];
diff --git a/llvm/test/CodeGen/ARM/force-global-merge.ll b/llvm/test/CodeGen/ARM/force-global-merge.ll
deleted file mode 100644
index a7b791dc0a634..0000000000000
--- a/llvm/test/CodeGen/ARM/force-global-merge.ll
+++ /dev/null
@@ -1,23 +0,0 @@
-; RUN: llc -mtriple=arm-eabi -force-enable-global-merge %s -o - | FileCheck %s
-
-@g_value1 = dso_local local_unnamed_addr global i32 0, align 4
-@g_value2 = dso_local local_unnamed_addr global i32 0, align 4
-@g_value3 = dso_local local_unnamed_addr global i32 0, align 4
-@g_value4 = dso_local local_unnamed_addr global i32 0, align 4
-
-define dso_local i32 @foo1() local_unnamed_addr {
-entry:
-  %0 = load i32, ptr @g_value1, align 4
-  %1 = load i32, ptr @g_value2, align 4
-  %2 = load i32, ptr @g_value3, align 4
-  %3 = load i32, ptr @g_value4, align 4
-  %call = tail call i32 @foo(i32 %0, i32 %1, i32 %2, i32 %3)
-  ret i32 %call
-}
-
-declare i32 @foo(i32, i32, i32, i32)
-
-; CHECK:      ldr     [[BASE:r[0-9]+]], .LCPI0_0
-; CHECK:      ldm     [[BASE]], {[[R0:r[0-9]+]], [[R1:r[0-9]+]], [[R2:r[0-9]+]], [[R3:r[0-9]+]]}
-; CHECK:      .LCPI0_0:
-; CHECK-NEXT: .long   .L_MergedGlobals

@Zhenhang1213 Zhenhang1213 deleted the fix_globalvalue branch November 15, 2025 19:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants